From 49b26ed93c5ce506c5d4e8dc91a1b64a508b5dbe Mon Sep 17 00:00:00 2001 From: "kaf24@planb.cl.cam.ac.uk" Date: Sun, 27 Feb 2005 18:49:13 +0000 Subject: [PATCH] bitkeeper revision 1.1236.5.1 (42221629GhhpYjgKPI7BEb9C8FJ2aA) Specify compile/target architectures for Xen build process via XEN_COMPILE_ARCH and XEN_TARGET_ARCH. Signed-off-by: Keir Fraser --- Makefile | 6 +++--- tools/Rules.mk | 8 ++++---- xen/Rules.mk | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 29b6203313..47a0d00157 100644 --- a/Makefile +++ b/Makefile @@ -22,9 +22,9 @@ XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildc export DESTDIR # Export target architecture overrides to Xen and Linux sub-trees. -ifneq ($(TARGET_ARCH),) -SUBARCH := $(subst x86_32,i386,$(TARGET_ARCH)) -export TARGET_ARCH SUBARCH +ifneq ($(XEN_TARGET_ARCH),) +SUBARCH := $(subst x86_32,i386,$(XEN_TARGET_ARCH)) +export XEN_TARGET_ARCH SUBARCH endif include buildconfigs/Rules.mk diff --git a/tools/Rules.mk b/tools/Rules.mk index eb89b3be05..4fb4551aeb 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -4,15 +4,15 @@ XEN_XC = $(XEN_ROOT)/tools/python/xen/lowlevel/xc XEN_LIBXC = $(XEN_ROOT)/tools/libxc XEN_LIBXUTIL = $(XEN_ROOT)/tools/libxutil -COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) -TARGET_ARCH ?= $(COMPILE_ARCH) +XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) +XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH) -ifeq ($(TARGET_ARCH),x86_32) +ifeq ($(XEN_TARGET_ARCH),x86_32) CFLAGS += -m32 -march=i686 LDFLAGS += -m elf_i386 endif -ifeq ($(TARGET_ARCH),x86_64) +ifeq ($(XEN_TARGET_ARCH),x86_64) CFLAGS += -m64 LDFLAGS += -m elf_x86_64 endif diff --git a/xen/Rules.mk b/xen/Rules.mk index 0d8a37bf4d..d8de5c3535 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -7,14 +7,14 @@ optimize ?= y crash_debug ?= n # Currently supported architectures: x86_32, x86_64 -COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) -TARGET_ARCH ?= $(COMPILE_ARCH) +XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) +XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH) # Set ARCH/SUBARCH appropriately. -override COMPILE_SUBARCH := $(COMPILE_ARCH) -override TARGET_SUBARCH := $(TARGET_ARCH) -override COMPILE_ARCH := $(patsubst x86%,x86,$(COMPILE_ARCH)) -override TARGET_ARCH := $(patsubst x86%,x86,$(TARGET_ARCH)) +override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH) +override TARGET_SUBARCH := $(XEN_TARGET_ARCH) +override COMPILE_ARCH := $(patsubst x86%,x86,$(XEN_COMPILE_ARCH)) +override TARGET_ARCH := $(patsubst x86%,x86,$(XEN_TARGET_ARCH)) TARGET := $(BASEDIR)/xen HDRS := $(wildcard $(BASEDIR)/include/xen/*.h) -- 2.30.2